From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 17 Jan 2011 03:05:08 +0000 (-0800)
Subject: * fontset.c (free_realized_fontset): Mark unreachable code with if (0).
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5134^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=add274d892babff852f02253e8784b9a0485f9f5;p=emacs.git

* fontset.c (free_realized_fontset): Mark unreachable code with if (0).

Previously it was marked by preceding it with "return;", but
Sun cc complains about this.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f034dd26020..cd7e89c82e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
+	Previously it was marked by preceding it with "return;", but
+	Sun cc complains about this.
+
 	* coding.c (decode_coding_emacs_mule): Remove unreachable code.
 	This is a typo left over from revno 95090 dated 2009-03-06,
 	which fixed Bug#2370.  Caught by Sun cc.
diff --git a/src/fontset.c b/src/fontset.c
index c38b01d4725..8d58f4cee9a 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -849,12 +849,12 @@ free_realized_fontset (FRAME_PTR f, Lisp_Object fontset)
 {
   Lisp_Object tail;
 
-  return;
-  for (tail = FONTSET_OBJLIST (fontset); CONSP (tail); tail = XCDR (tail))
-    {
-      xassert (FONT_OBJECT_P (XCAR (tail)));
-      font_close_object (f, XCAR (tail));
-    }
+  if (0)
+    for (tail = FONTSET_OBJLIST (fontset); CONSP (tail); tail = XCDR (tail))
+      {
+	xassert (FONT_OBJECT_P (XCAR (tail)));
+	font_close_object (f, XCAR (tail));
+      }
 }
 
 /* Free fontset of FACE defined on frame F.  Called from
@@ -2263,4 +2263,3 @@ at the vertical center of lines.  */);
   defsubr (&Sfontset_list_all);
 #endif
 }
-